Removed remains of old criterion selector in code for #72
Removed commented code
Split criteria set into backing bean and business logic, Measures are now deleted fixes #111