Removed most of the nbsp hacks