More stripping of extra functions and stuff