removed unused stuff
separated into pos and ori components