some  first cleanup!