Cleaned up unused classes
Added javadocs to interfaces