Upgrade to release v2.4.0 - Code cleanup