Fixed parser bug and removed some junk