revert 4907

revert changes in classes
not revert changes in tests (only remove constants in assets classes)