Remove unneeded method, add needed one