Removed unneeded setup routines