Clean unused variables. Javadoc + comments.