cleaning out unnecessary code