Removed unwanted compoenents