cleaned up redundant methods