Cleaning up some "old" stashes. Not sure if these changes are still relevant,
will review them at some point.