removing further shorcuts