Removed some unnecessary functionality