Fixed some problems, removed unused imports