Removing everything to prepare for Javadoc