Remove unneeded styles, fix failing tests, clean up large comments