Deleted files, changed a few variables