cleaned up more stuff before really digging in