Cleanup and Removal

  * Convert tab -> spaces
  * Clear extra whitespace
  * Remove script generation