Updated new mount code.

Well full removal of old actually because its now elsewhere. Also other
files.