Removed things that have been commented forever