Removed things which were moved to libraries