Removed unused code
Static Builder