some more cleaning
More cleaning up