Remove legacy file (I hope)
Update error message