Remove previous hack