Remove extra functions