Starting to remove things that are being done in the css file instead