Code cleanup for RaptorJS 3