cleaning up around here