Removing more unused code
Always show scroll bar so that page doesn't jump