Got rid of redundant methods