More clean up and removal