Removed more things that do not belong.