getting closer. also removing redundant files