Remove wrappers, adjust CSS for clearing