Remove some old methods, refactor variable names