Clean up of usings