Cleaned up build configurations