Updating methods, removing unused