Cleanup a few Fake* classes that I havent touched before