MOB-548: Remove unused vars, missing space