Remove deprecated code; styles are more or less working, yay!