Removed Old Code, Minor Fix