Fixed issue with extra lines

Removed unneeded class and fixed issue with tons of extra lines being
generated.