Cleanup of extraneous code