code clean up, remove extraneous stuff