Cleaned up after Robot Builder