Cleaned up imports to allow building in Java 7