Clear code and make 95 ready for production