[TASK] Cleanup Bootstrap Classes