Fix &amp;
Remove unused methods.