remove custom labels, fix y label logic