Removes unnecessary hack