Removed unused method, and misc cleanup