Remove junk (may be added again later if I decide to allow plugins)
Uhmm fix (cough) syntax errors