STYLE: Remove debugging message

Renamed file to match name of class.
Removed unecessary files.

Change-Id: I2e0d7a5f8936abfa9bc01844aca54348617db678