Removing the old code from this branch