Removed undefined crap