Remove more uneeded Uaa components