Clean up of comments, removal of obsolete files