Fixed the Bugs and added missing steps

We don't seem to be using this file, it should be removed