Removed unused imports, cleaned up style, logging and javadoc. Removed redundant unknown fo collection.