Removed extraneous code for production ready release