FIX: remove redundant file and conslidate