Some fixes and some removal