Clean up of unused file
No longer using static classes