Ticket 128: Clean up imports