Cleaned up docker branch