Remove session based approach
Remove extra margins to marginpar