Make a clean up to the code David Nolan suggested and remove some unused stuff