Remove cruft; add warnings