Removed unnecessary functionality