Cleanup for initial usage