Add labels, remove opyrs

PHI issue with opyrs