Refactored
Forgot to remove files a few commits ago