Removed all HACKS