removing excess code