Court clean up