cleaned up more code, removed useless imports