Cleaning up errors from gcc

Old files are being removed too, yay!