Just refactoring code: removed unecessary code