removes some excess code