Removing unnecessary functionality