cleanup and removed returned; replaced with elif statements