remove few hardcoded stuff.