Sort declarations, removed unused declaration