remove hugly code