Finished with isolating deperecated functionality, also tests