Cleanup and remove debug statements