Shobiz: continuing to cleanup code