Work/cleanup

Various cleanup