starting to flush out the remove function