A lot of code changes/unused file deletion/new functions