More work done on clean up