Updated Javadocs, deprecating class and removing unrequired methods