fixed ordering in cleanup.sql