Clean up un-used code and some code documentation