Fixed tiny issues, deleted a few things