remove other unneeded functions
fix other things