would have been final if VHIRL was using new code... lets update portal-core version soon VHIRL.
finish cleaning (and organise imports)