CAPX-17 | Cleanup of the .info file and require_once s