Remove unneeded code, dependencies