fixed another NPE and started with removing methods that return constants and do not have side effects