Cleaned

Removed redunant stuff