Little fixes and removing unnecessary code.