Remove unnecessary call & clean-up code