Module based SASS, cleanup