Clean up stage class

Remove unneeded code.

Other misc. cleanups.