Initial commit has to be cleaned up