[CLEANUP] - Warning cleanup