Fixing minor bugs and deleting files