Warning Removals and Clean up