Removed some stuff unrelated to this package