cleanup

I should review stuff before commiting…