Removed non-working parts