Production merge

Just some cleanup here