Cleanup. Initial fragment work