Fix: Remove class properties

Just to give you an idea!