moved some stuff to application and out of the bundle
not used
cosmetics