Remove unneccessary entry annotations
Add docu