Remove unnesseary crud