Cleanup, these are already in xt897 and preventing building