Remove clutter from Lib entry point

Change-Id: Ic099706c90ca3a5c725575beedf521f5497f5e37
Merge "Remove clutter from Lib entry point"