CleanUp

Constants & Interfaces removed...