Adjust documentation and remove unnecessary code