Got rid of unused import, class vars