Cleaned up extraneous