v24 Removed useless crap, fixed existing crap