Fixed remove axis problem and used constants from super class