Cleaned unnecessary stuff