FIX Cleaned unnecessary things