Cleanup of warnings and removal of static Spout.getEngine