Modified contract of removal and javadoc