added remove files and cleaned up stuff