remove from lists and previous working properly