Remove unnecessary functionality