some cleaning up stuff