remove hackish code