Removed unnecessery lines of code