Remove dead code. Propertified some stuff. Updated example property file