Improved Cleanup-Menu

There was a problem with the propcount since long time ago. Now I fixed
this problem and made the propcount also a bit more stable.