Fixed some issues with sensio check, removed some ode duplications und unused methods