Hopkins: Some cleanup commits

Some cleanup commits :)