Removing whitespace and dead functions