started condensing files, deleting old functions / files