Remove uneccessary imports and variables from classes