v.0.9_1 - Removed some old code from a very buggy feature