Tech Debt: cleaning up file