Cleanup and remove changes due to testing