Removed some unnecessary usage of