Drop unused cluster support