Mujir | #953 | some cleanup. removed unused vars etc..