cleaned a bit
deprecation
ignore more