Remove preambles.
Commented out code was using old method names etc.