Removing warnings and cleanup.