Skip unmaintained tests and cleanup