cleared out a lot of poor code