cleaned unused declarations and