Cleaning up unused/non-working code