Remove the functionality as well