fix spec and cleanup