Tag version 2 checked and done. Cleaned up some old crap