Remove unused methods, improve readability