removed the stuff I don't use