Removed some stuff I don't use