remove function to fix