Remove not needed entry point clutter