Added .longform and .shortform

Also removed now useless statements from Libraries.