Cleaning out some reduntant code and files