Started adding logging + Removed unneeded methods