Removed unsupported clean up methods