Deleted unnecessary boiler plate code