Removed some minor stuff