* Clean up some unused code * Use grid for abstract profile primaries * Remove blank line from default