Cleanup for source install. Use a logger for debugging