Removed redundant methods and data.