cleanup and a working proto with Play