mcollina Cleanup but not working yet.

Latest commit 0d9532e

Apr 4, 2015