Removing extraeneous code