fixing few best practices issues - Removing not used methods (refs: #616)