Made some simple changes across the board, as well as deleting unused plugins