Remove demo compatibility hacks