Cleanup of code
Prep for deploy
Small changes for mysql