Removed most of the separators