Cleaned up boss work