removed redundant methods and conditions