Housekeeping - removing dead code and files