cleaned out old code