Removed the rest of the withs