ST|BMM|AG: removed hacks and stuff.