Cleaned up code to production release