Fixed imports. Removed 2 extraneous apps