Removed trim axis

Removed trim axis.
Other minor changes.