more cleaning of redundant and same shortcuts