Refresh should work and got rid of unused classes