Jgraham/cleanup