still cleaning out needless vars