Removed lines causing trouble