Clean-up. Currently there is a bug with the generate file, but in
the process of fixing it currently.