Some cleanups

Remove unused staff 
Simplify some expressions