[Final] Removing warnings