Clean up load store

- Remove an extra mux in the load path.  This is currently critical path
for the design.
- Simplify store alignment and remove redundant muxes