Improved Logic
removed problematic files