Removed uneeded files and tightened up ordering of installs.