removed all rest stuff