Remove extra function
Remove extra stuff