Git rid of deprecated/unused classes
Convert two @Shared fields in to local variables