Added remove functions, and runtime comments