Removed some extraneous code