Cleaned up misc code no longer in use, previously commented out.