Removed useless method and more javadoc