first cleanup

RT