remove(some fixes)