remove old jobs
Cleanup and minor bugfixes