Fixed image problem, removed unused imports