Tidy up variables

Removes any local variables which are now set by the default theme.
Also cleans up the Axis setupAxisView to only set values which are not
set by the Axis draw method.