Removing excess code