Spring cleaning, remove dead code and OPPLE conditionals