starting page: improved cleanup