Cleaned few unnecessary methods and lines