Whitespace and remove old script