Remove old/unused file
Remove redundant code