removing concrete classes from output and also deleting empty @if block
linting errors