general cleanup after last commmit