Updated Javadocs, deprceating method and removing unrequired methods