Sorted out currently unused files