code clean up, removal of commented out test sections