Some cleanup i forgot.