Remove unused methods, whitespace fixes