Cleaned up imports to make eclipse happy