Remove out-dated javadocs and redundant code