Fixed bug with ignore type, removed unused code and comments