Clean up style, clear dead callback interfaces