Removed everything except Builder code