- removing check on resource in hack for issue #1, removed unused files, minor code changes