Remove unneeded functionality