Remove extraneous stuff
Improve pass message