commented more stuff out?