Remove some unimportant code, fix parsing that is unneeded