Removed excess code