working on remove, buggy