Clean up un-used code and console logs.