Removed 2 redundant methods