Fixed enter/leave message for capitals and removed old code