removed unnecessary alter scripts, fixed hbm mapping