remove obsolete hacks
fixed obsolete hacks