1xfix, some cleaning