Cleaned up imports from eclipse move command