fixes and remove unused packages