Code cleanup: No more (unnecessary) compiler warnings