Remove custom classes from Javier