More cleanup, removed old files