Removed usused stuff