Cleanup was actually meant for server