cleared out unnecessary code