Remove un-needed setup code