Still spaces clean-up