QWeb cleanups