removed some redundant methods