Continued clean up