fixed stack overflow, b0rged remove