cleanup

getting rid of unused things, unneeded things and updating the rdoc