Removing unused method, moving keys to the place where it's used