fix some errors and remove dependencys