Production Ready Changes

Uncommented production functions and removed test functions