Unnecessary Files and Imports Removed