Remove deprecated functions and play a little bit