Cleanup of the usings