Cleanup code, removed test as not relevant to morphia