general cleanup, removing font import