Feature/master cleanup

Reverting experiments, pry etc