cleaned up left over codes