Solved. Cleaned up some useless vars