Minor changes
-Reverted the bll before the merge
-Cleaned up because of existing pulling problems of non-existing files