Removed production directories
Added checks for redundent checking