Misc clean up - unused parameters and imports, etc.