Q3 cleaned up code

Q3 code cleaned up ( removed commented code )