removed some unnecessary and redundant methods