More cleanup and removal