CRAFTERCMS-96: Managing cleanup, moving or removing riles. Removed classes and removed commented code. Added javadoc to some methods