A little bit of clean up.

+ Cleaned up some stuff that was related to the other project that this
came from.