cleaning up development code/helpers