APD-482: Cleaned unwanted code