added more 'use' statements, removed redundant checks